87. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2022-11-18 03:12:08 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

87.1 Files compared

#LocationFileLast Modified
1Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/emailorder_update_guest.html2016-06-21 09:41:00 +0000
2Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/emailorder_update_guest.html2022-11-02 03:46:05 +0000

87.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged880
Changed723
Inserted00
Removed00

87.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

87.4 Active regular expressions

No regular expressions were active.

87.5 Comparison detail

1 <!-- 1 <!--
2 /** 2 /**
3  * Copyright © 2016 Magento
. All rights reserved.
 3  * Copyright © 
Magento, Inc. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6 --> 6 -->
7 <!--@subject {{trans "Update to your %store_name order" store_name=$store.getFrontendName()}} @--> 7 <!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
8 <!--@vars { 8 <!--@vars {
9 "var billing.getName()":"Guest Customer Name", 9 "var order_data.customer_name":"Guest Customer Name",
10 "var comment
":"Order Comment",
 10 "var comment|escape|nl2br":"Order Comment",
11 "var order.increment_id":"Order Id", 11 "var order.increment_id":"Order Id",
12 "var order.getStatusLabel()":"Order Status" 12 "var order_data.frontend_status_label":"Order Status",
    13 "var store.frontend_name":"Store Frontend Name",
    14 "var store_email":"Store Email",
    15 "var store_phone":"Store Phone",
    16 "var store_hours":"Store Hours"
13 } @--> 17 } @-->
14 {{template config_path="design/email/header_template"}} 18 {{template config_path="design/email/header_template"}}
15  19 
16 <table> 20 <table>
17     <tr class="email-intro"> 21     <tr class="email-intro">
18         <td> 22         <td>
19             <p class="greeting">{{trans "%name," name=$billing.getName()}}</p> 23             <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
20             <p> 24             <p>
21                 {{trans 25                 {{trans
22                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>." 26                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
23  27 
24                     increment_id=$order.increment_id 28                     increment_id=$order.increment_id
25                     order_status=$order.getStatusLabel() 29                     order_status=$order_data.frontend_status_label
26                 |raw}} 30                 |raw}}
27             </p> 31             </p>
28             <p> 32             <p>
29                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
 33                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>
' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
    34                 {{depend store_hours}}
    35                     {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
    36                 {{/depend}}
30             </p> 37             </p>
31         </td> 38         </td>
32     </tr> 39     </tr>
33     <tr class="email-information"> 40     <tr class="email-information">
34         <td> 41         <td>
35             {{depend comment}} 42             {{depend comment}}
36             <table class="message-info"> 43             <table class="message-info">
37                 <tr> 44                 <tr>
38                     <td> 45                     <td>
39                         {{var comment|escape|nl2br}} 46                         {{var comment|escape|nl2br}}
40                     </td> 47                     </td>
41                 </tr> 48                 </tr>
42             </table> 49             </table>
43             {{/depend}} 50             {{/depend}}
44         </td> 51         </td>
45     </tr> 52     </tr>
46 </table> 53 </table>
47  54 
48 {{template config_path="design/email/footer_template"}} 55 {{template config_path="design/email/footer_template"}}